From: Florian Müllner Date: Fri, 3 Oct 2014 14:40:49 +0000 (+0200) Subject: screencast: Re-add lockdown support X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2052 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dd42cfa8535b09fb6f8d91f4f845470c1df45f3e;p=gnome-shell.git screencast: Re-add lockdown support Commit 81bb7009ea120d3 removed support for the disable-disk-writes lockdown feature for screencasts, add it back. https://bugzilla.gnome.org/show_bug.cgi?id=737846 --- diff --git a/js/ui/screencast.js b/js/ui/screencast.js index def5dc9fa..dd78d39f7 100644 --- a/js/ui/screencast.js +++ b/js/ui/screencast.js @@ -43,6 +43,8 @@ const ScreencastService = new Lang.Class({ this._recorders = new Map(); + this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' }); + Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated)); }, @@ -103,7 +105,8 @@ const ScreencastService = new Lang.Class({ ScreencastAsync: function(params, invocation) { let returnValue = [false, '']; - if (!Main.sessionMode.allowScreencast) { + if (!Main.sessionMode.allowScreencast || + this._lockdownSettings.get_boolean('disable-save-to-disk')) { invocation.return_value(GLib.Variant.new('(bs)', returnValue)); return; } @@ -126,7 +129,8 @@ const ScreencastService = new Lang.Class({ ScreencastAreaAsync: function(params, invocation) { let returnValue = [false, '']; - if (!Main.sessionMode.allowScreencast) { + if (!Main.sessionMode.allowScreencast || + this._lockdownSettings.get_boolean('disable-save-to-disk')) { invocation.return_value(GLib.Variant.new('(bs)', returnValue)); return; }